Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

The Greate Upstream + TG Meta updates + Fixes #187

Merged
merged 705 commits into from
Jun 27, 2023
Merged

The Greate Upstream + TG Meta updates + Fixes #187

merged 705 commits into from
Jun 27, 2023

Conversation

MilenVolf
Copy link
Collaborator

Великий апстрим

  • Конфликты были успешно устранены, а функционал контента ветки arumoon-server сохранён.
  • Починен берет хамелеона, что был сломан этим пр-ом Ian masks update #162, а также добавлена возможность стягивания противогаза хамелеон с лица, без необходимости снятия.
  • Визарды оставили Нюкеров полностью без химки, теперь им был выдан взломанный ХимВенд, а также оставлен ХимМастер для удобства работы с химикатами из ХимВенда.
  • Шлюзы на планете Нюкеров и их шаттле были заменены на шлюзы Синдиката.

Kit0vras and others added 30 commits June 15, 2023 11:24
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: deltanedas <@deltanedas:kde.org>
* eva suit resprite

* speed bump

* yaml linter fix
…#17250)

* Add network configurator to utility belt fill

* Empty commit to rerun tests
* basefoodcondimentbottle tweaks

* move to drinkscondiments, inherit from drinksbase

* Revert "move to drinkscondiments, inherit from drinksbase"

This reverts commit a54604d.

* oh boy here I go overcomplicating stuff again
* allow grilles to be placed on lattice

* Revert "allow grilles to be placed on lattice"

This reverts commit 5c53668.

* allow grilles to be placed on lattice (fixed)

* file namespace
@AruMoon AruMoon merged commit 5ea0771 into Workbench-Team:arumoon-server Jun 27, 2023
@MilenVolf MilenVolf deleted the Test-merge branch July 3, 2023 18:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.